From be090840c2959a021aa95f5077b799d9e65fabca Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild2.aw" Date: Wed, 13 Dec 2006 11:18:16 -0700 Subject: [PATCH] [IA64] fix build with sn2 and machvec support Initial changes to make tree build again after applying new files for sn2 and machvec support, without actually enabling the new features Signed-off-by: Jes Sorensen --- xen/include/asm-ia64/linux-xen/asm/sn/intr.h | 6 ++++++ xen/include/asm-ia64/linux-xen/asm/sn/nodepda.h | 4 ++++ xen/include/asm-ia64/linux-xen/asm/sn/types.h | 2 ++ xen/include/asm-ia64/linux-xen/asm/types.h | 8 ++++++++ 4 files changed, 20 insertions(+) diff --git a/xen/include/asm-ia64/linux-xen/asm/sn/intr.h b/xen/include/asm-ia64/linux-xen/asm/sn/intr.h index 12b54ddb06..5e7ef5c993 100644 --- a/xen/include/asm-ia64/linux-xen/asm/sn/intr.h +++ b/xen/include/asm-ia64/linux-xen/asm/sn/intr.h @@ -9,7 +9,11 @@ #ifndef _ASM_IA64_SN_INTR_H #define _ASM_IA64_SN_INTR_H +#ifndef XEN #include +#else +#include +#endif #include #define SGI_UART_VECTOR 0xe9 @@ -51,7 +55,9 @@ struct sn_irq_info { int irq_flags; /* flags */ int irq_share_cnt; /* num devices sharing IRQ */ struct list_head list; /* list of sn_irq_info structs */ +#ifndef XEN struct rcu_head rcu; /* rcu callback list */ +#endif }; extern void sn_send_IPI_phys(int, long, int, int); diff --git a/xen/include/asm-ia64/linux-xen/asm/sn/nodepda.h b/xen/include/asm-ia64/linux-xen/asm/sn/nodepda.h index 6f6d69e39f..ffa4302423 100644 --- a/xen/include/asm-ia64/linux-xen/asm/sn/nodepda.h +++ b/xen/include/asm-ia64/linux-xen/asm/sn/nodepda.h @@ -13,7 +13,9 @@ #include #include #include +#ifndef XEN #include +#endif /* * NUMA Node-Specific Data structures are defined in this file. @@ -38,12 +40,14 @@ struct phys_cpuid { struct nodepda_s { void *pdinfo; /* Platform-dependent per-node info */ +#ifndef XEN /* * The BTEs on this node are shared by the local cpus */ struct bteinfo_s bte_if[MAX_BTES_PER_NODE]; /* Virtual Interface */ struct timer_list bte_recovery_timer; spinlock_t bte_recovery_lock; +#endif /* * Array of pointers to the nodepdas for each node. diff --git a/xen/include/asm-ia64/linux-xen/asm/sn/types.h b/xen/include/asm-ia64/linux-xen/asm/sn/types.h index 8e04ee211e..6df228178a 100644 --- a/xen/include/asm-ia64/linux-xen/asm/sn/types.h +++ b/xen/include/asm-ia64/linux-xen/asm/sn/types.h @@ -20,7 +20,9 @@ typedef unsigned char slotid_t; /* slot (blade) within module */ typedef unsigned char slabid_t; /* slab (asic) within slot */ typedef u64 nic_t; typedef unsigned long iopaddr_t; +#ifndef XEN typedef unsigned long paddr_t; +#endif typedef short cnodeid_t; #endif /* _ASM_IA64_SN_TYPES_H */ diff --git a/xen/include/asm-ia64/linux-xen/asm/types.h b/xen/include/asm-ia64/linux-xen/asm/types.h index d2c04d3f6a..3dcfa34ae7 100644 --- a/xen/include/asm-ia64/linux-xen/asm/types.h +++ b/xen/include/asm-ia64/linux-xen/asm/types.h @@ -74,6 +74,14 @@ typedef unsigned short kmem_bufctl_t; #ifdef XEN #include + +#ifndef __ASSEMBLY__ +typedef unsigned int gfp_t; +typedef u64 resource_size_t; +typedef u32 dev_t; +typedef unsigned int mode_t; +#define THIS_MODULE NULL +#endif #endif #endif /* _ASM_IA64_TYPES_H */ -- 2.30.2